Fix for issue #52 part 2