v3.1.4: fix a huge mess

Signed-off-by: Kwpolska <kwpolska@gmail.com>