Fix wrong tasks