[PATCH conductor 1/2] Fix BZ 674564