Fix bubbling
Fix precision issue