Fix for Issue 69