Dirty fix for message not existing