Release candidate bug fix