Further improvement to c49fdd5