Fixing Joshua's buggy adds...