temporary work around for issue #706