Backend bug-fix 1