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