Final battle now ends properly