Little bit more sanity