Related to https://framagit.org/vv221/play.it-games/issues/91 & https://framagit.org/vv221/play.it-games/issues/92