I've attempted a fix in 8695591, turns out it doesn't actually fix it just makes it harder to preform.
