4/9 - bug fix