fixing cases where we skipping tasks that we shouldn't be skipping