support 1.1beta6 changes