fixed for 0.5.17