Support for 1.2.0p17