Bug when returning tasks fixed