Merged 687

Merged tie generation fix.