Fix the backward compatibility with previous layout.