Fix for compliance with standards development