Fixing http://jira2.lgsvl.com/browse/BHV-3479

This should be merged regardless of BHV-3479 – should have been fixed long ago.