Fixing incredibly stupid bug