workaround BZ 901540