added feature-relevant fix