Bug fix in backend