attempt 4 at fixing github issue