Handle Issue #89 properly