Closes #2699 tried to make it a cleaner diff, but this is the best I could do Reviewed-on: OpenWF/SpaceNinjaServer#2700 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>