Improve sanity