matching code in release 1.0.8.