#258 - Fix moving tasks