initial attempts at fixing #101