Fixed dangerous shit