Fix for user data not being cover per #3378