modifications for issue #53