Fix for Issue 15