fix issues 103