Modified for support in 1.6