Part two of the previous bugfix, this time I did test it xD