Probably fixed saving message to DB