Change logic to fix FC041