modifications for issue #202