Shameless commit with known bug