Adopt code for fife issue 754.