Finally a fix that is acceptable.