Make sure it doesn't happend again