Another fix that may need to be on github first