Revert "To fix #317"

This reverts commit 676068f1b64bc1ae2c199ce6d88683641f07a52d.

It has to be fixed in master