Fixed breaking code for message interface