Import #177 to 2.0 beta