Patched the experimental class so that it won't return null