Stage3 bug fix