Issue #121 - Fix Backend