Reverted some changes.. still burner bug