I think this should fix it? https://github.com/big...