Revert "Fixed code"

This reverts commit 5baf00b4e625e195c73b670dd4bcc269f6c73bba.
Fixed Code (once again)