Fixed issue where newly added handlers were called immediately