Revert "FIX #25"

This reverts commit bb604effa47e2e0835fc5b5dbfd4f3d25696d58f.