attempt 6 at fixing github issue