Drift correction fixed