One last fix to #71