Work-around issue 3895