Fix of 404 bug