Actually tried to fix that bug, but then it broke all of the speedrun methods... So i just kept it there :)
