Fix for Issue 118