minor handler bugfix