My fix proposal.