Fix a bug which caused some tasks to be rarely completely dropped. Now things should work as before - with added performance benefit when relevant