Really fixed infinite spike of doom this time