reapplied the fix I just commited earlier..