a bit hacky but works on all embers now