Make Compatible with AS 0.8.1