Fixing Silly bug