fix issues 41