FIX #59: avoid half-drawn residues