Fix for "Standards - Not accessible after passed #7"