support 1.1BETA5 changes