Merge pull request #1262 from jpereira/fix/better-msg1