Hopefully bug fixed.