Fix the message pump