Bug in expandos handling fixed