Fixes in Cameleon. See #460.