Fixed loading of handlers