Small change to get more BS3 compliant