Fix errors resulting from price matrix work
Merge pull request #423 from fahadhatib/develop

Fix errors resulting from price matrix work