I think the messages for prefix/suffix are the same whether or not the suffix has been set. Could you make sure and adjust accordingly?