5530: temporary fixed to prevent header errors