little changes on previous bug fix