Fixed another bug in messages