Add fix that's in master. Fix indentation.