Improve recent commit, Thanks to Zergtmn for the idea

(based on commit b7b7e57)

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