ed50156 fix #159