fix listener crash

removed old hack and fixed input listerner crash