Oh, ok. Would be great to get rid of this hack- suggestions/PRs welcome! :-)