USER bug fix