C1

bug#1939, tested using core-tests