Revert issue #17 #34