Hopefully fixing bug that crashed everything