newer version that Hopefully fixes more issues