Fix for restricted=null