Added workaround for bug to be removed GH1070

Added workaround for bug to be removed GH1070