Bugfix in messages