Fix for STS-3671