Starting to fix for ember 1.8