continued with bug fix