bug Fixed NullPointer