Possible fix for crazy github issue?