Roger's suggested fix