stick to 0.9.6