Make compatible with 0.11