workaround for issue #474