As I compiled org-mode today I noticed a free variable and I think this change fixes it.