Add solution for #12394 Peer Review