1.9.9 Fix all bug