Fixed problematic bug with ootb features