fix NullPointer