fixed issue156