Another fix to #179