This is an ongoing problem so I'm going to open up a separate branch for it and try and find a solution.