Fixing the internal messagery.
Merge pull request #502 from ngodfraind/bugfix

Fixing the internal messagery.