fixing awful bug