Revert "BugFixes #3"

This reverts commit 1a9e2ee13f4402054e89df1e643b7a4c71ed89e1.
Enää en tee