Hopeful fix for bug on this branch