#816 - Added fix for custom notice tokens