Issue #121 - Fix the backend