Fixed merge of 404 fix