trying to fix some weirdness (maybe related to ember bug)