Fix problematics requires