Make it more forgiving