Patch from Scott McKellar: