404Action fix, continued