Fix #7 - figure ordering.