Little 500 bug fix