fixed messagehandler