minor fix to handler