Fix to hack (was it Jacob or me?)