Fixed drifing problem. Maybe...