Fix for fully qualified Class name