Make more compatible