change dynamic check, when no class defined return false + unit test