c15 fix bug