I've entered a bug and a small patch that may address this problem. At the very least, it works for some cases.