includes fix for #335 in exp branch