fix #159

May be more bugs like that