Fixed nullpointer!