Interim fix for deployment bug