Issue #88 FIX