Support > 0.9 properly