Bugfix nullpointer..