Missed one %MESSAGE% in the code - also re-added 0 mode fix