Solves issues surround promotion codes.  Also should fix issue #1143