Fix the rest of commit#29b4ed4dd611ab3eb07ae0f0689d20660cae9bcb