fix #3 part 2