Second attempt at fixing #27