Import #174 to 2.0 branch