Attempt at fixing #416