Fixed #110 bug

Fixed #110 bug