fixing aftermoving errors!