Possible fix for prod