Fix for Issue 95