fixed #3229, review