Hopefully fixed github issue