upd: Fix for Issue #10