Fix for new React