Minimal fix to #97