Add #72 from upstream