#1 - Fix bug 404 Not Found Error