Fix for restrictions