Simple drift-correction mechanism, for issue #6