Fixes pricing issues by GuigZ-