Fixed NullPointer