adapt according to latest chameleon