Merge pull request #499 from ngodfraind/bugfix

Bugfix
Fixing the internal messagery.