patch by Nick Jenkins: