Added fix for standards preference issue