[Maxximou5]

Another great contribution, thanks for doing that. These bugs were annoying a lot of users, including myself.

Speaking of which, I gotta make a pull request for LGSM now...