Fixing bugs backend