Hopeful fix for Issue: #58