[c3026] Improve previous commit

(based on commit [3026] - f6933a8)

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