Fixed bug #1
Revert "Fixed bug #1"

This reverts commit cf0094d00d78c998ef3f508e4a417e6992c955e1.