fix return value for handlers