Attempt to get it working on staging