Second attempt at fixing #76.