more precise premove handling