bb3e06f fix (c)