Fixing the ember code