Candidate fix for 2398