Fix invalid tasks | close #4