Fix issue #40 part 2