Fix #issue101