3.0 fix commit

Signed-off-by: ZorgeR <zorg.rhrd@gmail.com>