Fixing backend bug