Make bespoke-fx compatible with latest bespoke