Fix 2 for Issue #15