Candidate fix for ticket [711d04b6d8]