Remote task fix