This either fixes something, or just makes it slightly slower