Added fix for standards preference issue
Merge pull request #512 from parthibane/master

Added fix for standards preference issue