Fixed small bug with short messages