fix for a NPE