Revert "fixes #80"

This reverts commit 4ad6dee70229d9357b6834a8b91a1260dfae82d9.
fixes #80 fixes #81