Prepared for 0.6.2.