-Fixed bug that could cause crashes