Fixed regression with API < 15