Issue #160 - Fix the backend