Fixes scheduling errors
v.2.7.2