final change with bug fix