Fixed to work with AS 1.0