support bug fix