fixed emberjs stuff