prepare for 0.17