bugfix for message completion