Fixed the handler