#111: potentially fixes the move issue