fixes #4334 this should fix wait message is sometimes hidden