Issue #289 Fix