Backend bug fix