fixing so we wont die