Corrected message bug, fixes #86