Add safety check, update stated version