Fix for issue #16 part 2