Add fix to catalog and service