for issue #46