Make STOP functionality ISO-standards conformant