changes related to issue #169