[3] Applied patch 2

Signed-off-by: Wortex <Wortexqq@Gmail.com>