Revert commit till #89 is fixed