added fixes for the other variants as well

thanks https://github.com/Efpophis <efpophis@efpophis.net>