temp. fixed NullpointerExc.