Ensure compatability with React master