Added fix for standards