fix the #1151 issue