Self serve fix for Casablanca