0.6 compat