Entity folder initialization fix