Last message correction

Closes #55