Resolution of #477 into master

A quick change going straight to production.