for 0.24
fixed #135