Fixed ServiceLoader class-loading issue.