Fix: problems with checks while moving