fixed issue 116