Add #67 from upstream