bugfix for NPE