Revert "Revert "fix #72""

This reverts commit b658e684110bedd6f20fde7924330faaabf39b95.