Bugfix for the backend