Fixing issue #58

Another stab at fixing this issue.