Fix issue #12 part 2