ClassNotFound bug fixed