check-pick chaman's bug fix