fixed issue 115