Performing modifications described in issue #23