I don't think we have that fixed in master but I've pulled in https://tickets.puppetlabs.com/browse/FACT-322 to this sprint to sort out this madness once and for all.