prepared for 0.8.8