reverting d839ee0 (fixing #58)