Fix for Issue 40