Correct Messages troubles for #39