[ticket/12508] Some more fixing

PHPBB3-12508