Hopefully resolves NPEs.