continuing the bug fix of the previous commit