Work-around for previously fixed issue