Tweak to attempt to get rid of NPE