Candidate bug fix, single instance