Another bug fix for deployment