Hopefully bug fixed