Refinement of latest bug fix