Added logic in conversion code to implement the rule above.

Took out some broken code to unscrew some hysterical breakage.