Fix all bug