working on fixing 'empty message' bug