fixed NullException