attempt 5 at fixing github issue