make it work with new props