fixed NSNull issue