New bug fix, now with 10% more fix and 20% less bug!
merge?