Steve Ebersole, yes. #1089 is good to go. It solves not only this issue, but also others that were created after this one and are related.