Revert "Try fix #issue3"

This reverts commit 422fdf93d4d553f837ab58192db2a726bb8af762.