Fix ember spirit buck