Follow up bbaf8692374a82323858c4468f345d03cd05216d

Thanks to malufett.

Signed-off-by: shennetsind <ind@henn.et>
Follow up 547b01da35d290b633efaefbbc3af2755d2811e7

Thanks to Haruna, ossi0110

Signed-off-by: shennetsind <ind@henn.et>
Merge branch 'master' of https://github.com/HerculesWS/Hercules into ghbb