add #31 issue