Bugifixing of backend change