Revert "quickfix for #168"

This reverts commit 5d4deaddf44423f2347ccdd9565a62c8ecb3db24.
Revert "Revert "quickfix for #168""

This reverts commit 6930555ddf99b4b475d2c605eb224f1f3ee25170.