Fixed awful bug