Fix for 404 not working properly