Resolve Gitlab issue #55: in endgame, some object starting states are incorrect