Fix task before & after config