fix issues 9