For PLFM-1636, enforce the correct write order