Fix for "unable to map classes to root", issue