Attempt at fixing #48