Fix for Issue 63