Second attempt at fixing #29