FIX. Issue #248