Move notFound to correct place