fixed issue 235