Fix for Issue 105