Fixed bug that would always kill you