Level 4 bug fix