Fix for Issue 110