Bugfix MessageHandler
current state