Made more compatible.