attempted to fix next - seems to work locall but not on prod
Merge pull request #875 from tonyrd/development

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