Fix for prod