fixed merge: messed up backend.c and forgot to add it before commiting