fix FC #019