404 behaviour fix