Small fix for Commerce 3 compatibility