fix issues 1 and 2