hmm... why this was commented out? fixed tests & compared to upstream