More 0.12 compatiblity