fix to work in staging