fix issue which Leo pointed out