attempt at fixing #41