Fixing to change order of save/complete task