Trying to fix for deployment