Hopefully bug fixed this time