Patch 1

Please, read my comment and fix your code