Merge in final state fix from kostko