Reverting commit 80ca143, fixes issue #63