Addresses https://gitlab.com/arctic-fox/spectator/-/issues/25 and https://github.com/icy-arctic-fox/spectator/issues/24