fix issue in fbb472c and 7e1a4f9