Fix order for files handlers