bugfix nullPointerException