Attempt to resolve NPE