Fixed: 'oneShotMessage' doesn't get displayed. (Prev commit was incomplete.)