comply to Beta 7 changes