fixing handler name and making it not return it