Temporary fix to get staging working