Indent the patch from Andrew and make it compile again