Emit fsx issue124

Not to be merged yet, needs tidying.