hopefully fixes issues with NPE