issue #24 revert changes