Fixes premature handler execution after adding force-handlers