[s2675] Add forgotten part of [s2673]

(based on commit 05d044f)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>