Fixed #3492 -- use a better API	 (#3497)

* Fixed #3492 -- use a better API

* More correct types

* Revert "More correct types"

This reverts commit e7412927eccf2b983bbcab2d2864ae1e4e83b56f.
2 files changed