Fix for deployment bug