attempted to fix next - seems to work locall but not on prod