Fix handlers not being able to be found